Added some testing logic to our startup code.