Added some test configuration and controllers