Fixed tests;