CS Fixes
Updated test to use mock