Creating infrastructure for tests
making the scan prototype look better