validation updates and tests