Merge branch 'add-more-advice-adapter-tests' into 'master'

Add more tests for AdviceAdapter, and fix a bug found with these tests.

See merge request asm/asm!142