Removing Moq
Fixing reference to static lists