Fixing issue with -> operator, and cleaning up the test