Adding basic synchronisation integration tests and fixing issues
accordingly