Fix the inheritance
Add a bit of testing