Adding tests and infrastructure around.