DEV BRANCH ONLY: simpletest module

Change-Id: I9faf633c482fe80cbe4d8d17c21a3e3f18597982