Phill & Alan: commit of test and pico functionality