normalized channed code, restored tests execution.