rename cake test directories and fix a few testsg