Fixing two tests