Move test classes to test scope
Merged in develop branch