new testcases, removed debug output and temporary testing code