Fixes for broken tests following 0eabe2a (bug 878368)