Refactored test config