Fixed some tests
Removed more risk unit tests
Merge branch 'remove-tests' into special-assets