Updates to tests and verification code