Include integration tests for tagging and fix some minor problems