Tests CS Fixes