Migrated over unit tests. Half way done