Added tests for custom objects