Controller fix
Tests