Modified test directory structure
More rhipe tests.
Merge branch 'rhipe'