Added collection support
Fixed test name