Test refactor. Validator test still not implemented