26 tests and  fix for new functional