Renaming to avoid py.test naming conflict