Added tests for user correctness