Fixed the failed subgoals' problem, some more goal testing