Tweaked the tests in BasicTest