All test methods now pass. Next step analysing/optimising what gets executed on client/server