Fixing rest tests