Added tests for existing classes