some style changes, made testSet dir changes