Fix tests
Improve project assets