Remove debug option
Fix few tests