Created a simpler test controller
Added fix(?) for SPR-10440 test case