Renamed dummy to mock. Cleanups