Making the test reflect reality a bit more...