Added test folder hierarchy. Doesn't run yet.