Fixed tests due to fixture name changes