Fixing tests with new spec and new function args