pulling updates
Merge remote-tracking branch 'sean/master'
comments added to test classes