Remove print
Add another sub dirs for specific modes of tests