Fixed support for inheritance and finders

Some more refactoring of RSpecs