Added a little test framework and some tests