Yet another attempt at passing the tests.