Add fixtures and utilities for testing
Add tests