Added test mode, removed default controllers