Remove mocking dependency and rename noserver to camelCase