Update unit tests, cleanup files