modularize tests