New tests implementation
More data fixes