refactor test fixtures and get started on integration test