Fixing testing cases