More tests (largely unit tests)