Fixes tests, Remove all debug code.