tests, and fixes for those tests
split out roundrobin, more tests