Allow to have more then 1 class/interface in a test files
Merge branch 'master' into in-portal