Some tweaking to the basic tests.