Added Prototype tests
Merge branch 'prototype-tests'