Removed old debugging code and fixed test count