improving tests
Merge pull request #93 from simboss/upm

improving tests