WIP simplified tester

TODO's are in the code.

Change-Id: I5fc098802ec0482370b70ab42236bf4dc74fe6f4