fix tests, rename tests