Fixes for test suit