Improved container and added Unit test controller. Depends on PHPunit.