validator removed and tests added