Revert "Test controller state"

This reverts commit a301feff3e2e0d094f7f665f1e498b68fe153fb4.