Added unit test for instance/class methods