Fix the obvious test cases