Fix app uses and remove controller test