more merge fixes

test bed is now called game