Cleaned up a few test cases after refactoring and removing GUI dependency.