Fixes the remaining tests