More or less finished with unit tests