Testcase updates, error message cleaning