I already have this tests cover, I'll take this and fix it ;-)

I just need to fix a couple of tests that are failing and it's ready to go!