Remaining tests now passing