fixes for all function and full test