tweaks to controller mapping and unit test