More inheritance and tests