added containers for tests and option for how to choose a test