update tests to reflect actual use of uint64, etc