Fixed Super calling parent class directly
Added basic unit test setup