Test options and targets interspersed
Update roadmap