Additional unit tests, refactored test files