Added a unit test, and added support for transaction numbers