Fix nuspec and tests