Merge pull request #423 from Ukalnins/fix_test_compilation

#422 copy fix from #387 also to test scheme