More work on #16

Make stubs for our test libraries