tests: refactor test layout