Renamed and updated tests for Sohial and Joe