More tests and some transport fixes