Fixed the test a bit and tweaked a couple of details