Fixes for multiple tests