Fixed and simplified tests.