This time with tests.