some test and inheritance changes