> Would it be appropriate to change the "choose" method to "choice"? 

Yep, just make sure the tests still pass before and after the change. :)

> should the name of "test_pkgimport" instead be "test_pkg_import"?

Since things are moving it's fine to rename the file.

> would it be best to perform all of these changes within separate pull requests, or are they minor enough to be combined into one?

Separate are easier to review.