Issue336 test namespace clash rebase

This pull-request is discussed in #336 and still needs some work.