Added goal state testing