more tests & next scope fix