Fix tests after recent changes
Merge branch 'bugfix_0_9'