Finished refactoring unit tests
WIP adding additional unit tests