Added tests for core classes