Fixed and renamed tests.