tests refactor and extension - fixes