* Migrating tests * Adding more tests * Adding more tests and helper functions * Adding more tests * Cleaning up