DRY'd up all embedded and in-container tests.