#53 Added tests for inheritance + fixed bug