Added basic test collection handling