Refactoring the fixtures and some other QA improvements