Fixed and improved tests.