split up test and make