fixed args allowing for test mode