Tests pass now, yay
(includes .csproj change for the last commit)