more tests done
Merge remote-tracking branch 'sean/master'