corrected some unit test issues for cafetownsend
Merge remote-tracking branch 'origin/master'