Refactoring structure of unit tests to work as testsuite for other containers