Reworked some tests.