Test case fixing...