Work on synchronisation, tests failing