Make more testable