Cleanup the project and changed the unit tests (incomplete).