Fixes remaining tests