Another round for tests fixing