Organised tests
Cleaner descriptors
Removing some diagnostic boilerplate
Fixing nuget package creation