Added test, removed restrictions in the inheritance mechanism