add skip_container option & split unit tests in separate files