Restore junit test suite patterns