Moq / Tests / Fixes