Remaining fixes on remaining tests