restructured test folder layout