Reworked tests.