Merge "Add tests for .equals and toString"