Fixes for Tests