Last pieces of test coverage for core classes