Fixed all the tests. This thing is now really ready to be merged :)
6 files changed