Refactor - Simplify test reading