added moq and controller tests