removing direct calls to helpers
separating integration and unit tests and their helpers