Fixes from merge

Added back code that got taken out from merge that makes userValidate feature work.
Added tap module to dev dependencies.