Merge "Removed littlemock dependency and cleanup"