Modularize testing