Update to Autofac 3.1.1, FluentAssertions 2.1, Add Moq test, some minor internal cleanups