add integration tests

I also cleaned up the names of some old tests so they are in line
with the associated commands