Put test in correct package.  No longer need to import model package.