Fixes for ignored functional tests