Fixed the total fail Don mentioned, but test of ContentProvider still
terrible