removed excessive validation, corrected tests