WIP. Modifications to tests.