Updates #1
Some initial test infrastructure