Test cleanup and bug fixes

Fixed a couple of bugs while cleaning up tests and writing new tests.
Tests (Choreograph_test.cpp) themselves are written in a more literate style.
Closes #11