Fixed serialisation of data
Added CRON sampling
Fixed tests around push data