fixes for functionality tests