Add helpers and utilities for test