Updated the Client specs' cleanup to work across platforms.
Updated the Client specs' cleanup to work across platforms.

DouglasAllen/halcyon,mtodd/halcyon,DouglasAllen/halcyon,DouglasAllen/halcyon,mtodd/halcyon