Merge "fix build. optional tests broke" into klp-dev