Update tests. Update DI to use new version of Pimple
Add more tests. Refactor code.