Fix tests and asset reification bug
2.3.1