General tweaks to test and controller.