Fixing testing options