I re-worked the test as described, what do you think?