Adds Simple Tests

Also cleans up a lot of other example code.