Refs #71. Updated the names. Still not enthusiastic about the name, but it's at least descriptive
Refs #71. Bumped the expected time for python 3