Improved some tests.