Added some various tests for the new classes