Added more integration tests allowing for better code coverage'