Fixing 5 of 8 failing unit tests when compiled with 1.9