More tests and utilities.