Added some new tests for new classes