Tweaked the tests