Nr of occ

This pull request includes updates from the test-annotation branch (commits from @peterdesmet at Oct 30 and 31) and  the nr-of-occ branch (commits from @bartaelterman at Nov 5 and 6)