22 integration tests

Just a couple of basic tests, but better to get it into master than let it be hanging by the side.