Updating test to be a little more robust