Remove *.Behaviour
Fix sync test