Begin work on a test framework
Merge master
Test framework working, add a few simple tests