New tests

Max code coverage for public classes reached.