Reworked the from-to tests.