[greg and jashaad] "refactored test classes"