fixed request class names; more tests for identifier names