Minor changes, removal of debug tests