Modularize tests