Review methods in new classes, also tests

All review methods in new manager.
Same with unit test and integration test.