Fixes for various tests