Support for multiple Tests, and inheritance fixes