Add new classscanner tests + fixes