Tests and fix for distinct on issues for all resolvers.
Switch to using ILBundle rather than ILMerge.
Remove unusable tests.