Cleaned up the specs to match the new request style