Added in test framework and some tests