TODO and ERROR removed
Regression test improve reliability