Dont monitor test results
Merged test with utf-8 fixes
Baseclass for pycolator integration tests
Made a start on integration test for merge
Merge conflict fixing