Move test of controller to correct package