Adding very simple test infrastructure