Fixes for test errors