Minor changes for consistency, 1 failure and 13 test errors