Refectored tests.