Issue 167

I didn't really change the tests behaviours as they are ok, I mainly changed them to use multiple keys instead of one.