Added some tests for new subclass