Fixed unit tests (except remove)
Finished unit testing.