Restructure integration tests

Closes #161, #162