Added more tests and fixed bugs related to adding / editing request types