Updated debugging
Updated testing