more extensive testing, more scope handling