Added more unit test, transaction xml config and annotation