Fixes test and renames controller