Add some tests and infra to run them