re-ordered test results and removed debug functions