Added new test case type and whatnot