Few more tests refactorings