More tests and less printing