Cleaned up tests and started working on more granular test suite.