Clean up debug info & add sample test case