Fixed recursive key bug

Also changed the structure of the tests, matching grunt's
Version changed after last bug fixed