Fix tests to use fail fast initialization
Tighten-up code.