rename some variables
fix tests

Added Hard-coded data for create some mocks