Small additions to program flow for testing purposes