Refactoring legacy tests so there are no container dependencies

This PR refactors old tests that relied on the container in order to run.

This PR should not cause the coverage % to fall.

Fixes #35