Test data and some tests refactoring