cleaning up tests, adding dummy functions
Merge remote-tracking branch 'origin/anne-test-improvements'