Fixed Super behvaiour. Added unit tests.