Improved tests (a little).