Prototype update. More tests.