Added some needed tests to core classes