Bug 1075304 - Follow up, fix unit tests