Improved a few tests.