some work
fixed test
added uom values in test
Merge pull request #723 from swarbhanu/fix_nightly

Should fix nightly build