Cleanup: Removed some debug tests and aligned text