Removed remaining and various occurrences of 'tx', starting to run tests and verify code