tidying up some test structure and adding first integration tests