disable integration testing for now
clean up messy code