Make scalar assertions more consistent
Add validate_that from @jrnold. Closes #1