Fixed bugs in creating request types
Added a test for request types
Merge branch 'master' into dev