further updates to test drive WIP