POPS-277 reverted test code
Merge pull request #51 from vinkobuble/develop

POPS-277 reverted test code