Merge branch 'test' of github.cyanoptics.com:cgaonker/cord-tester into test