Refactored test package structure