Misc. update of Prototype and Tests sections