Moved fixtures and helpers into separate files