Fixing up basic tests.