More testing
Straightened interfaces
Fixed nuget package creation