refactored tests (bug 843691)
Merge pull request #638 from ednapiranha/bug843691

refactored tests (bug 843691)