Add some test infrastructure and update metadata