ESLcup: remove test functions + little fix