Begin to add test framework