Changed testing in main a bit