fixing all functionality test v1