Fixes around tests