Fixed bad test assumptions about returned data types