added initial subtests for collection, added unload-function in helper
removed dead code