Fix tests and asset resolving