Tests currently do not pass, not even sure the last time they were run :-( Want to set up CI system so that commits can be evaluated against passing the tests.