Modulize tests