Merge "Add unit test for Instructions class and improve Criteria toString() test"