add fixtures and more