improved tests, testcollector now tests all