Switched back to nuget test support