Added correctness testing