Reverted to assertSame again