Improved and expanded some tests.