Fixed Salat trait test by moving model and test into packages and getting rid of duplicate context import
Merge pull request #1 from rktoomey/master

Fix test

// Thanks John.