Tests are now a bit more complete.