Added some more tests and make use of Symfony Config Component.