OS-1859: clean up the test/dev story per feedback from wdp
OS-1859: make check convenience from src/img dir