Test fixes

Slowing fixing the gem...