fixes for functionality test