More progress on testing / development