Add missing infrastructure tests

This restores the tests which were not included when you merged in #130.  No changes are made to the library.