tests: more non-container tests and fixes