Refactor tests.
Merge pull request #3 from Desire2Learn-Valence/dbatiste/refactor-tests

Refactor tests.