Testmode fix, non testmode wasn't working