Added a system test and fixed all the thing I broke before in the process
Merge pull request #2 from edorian/master

Added a system test and fixed all the thing I broke before in the process