93 add unique field tests

Closes #93 
This branch is being merged back in to 86FixTests which will eventually be merged back into master