Add some category tests and added cleanup and teardown functions