Refactor test to reflect module organization