Start adding some infrastructure for tests