Add test/run to simplify testing