fix fixtures and some tests