update tests to be a bit more robust