bug 983322 - keep test logic out of shipping code