Issue #87. Test for MozTrap 5930
cleaned up
resolved merge conflicts
resolved merge conflict
resolved merge conflict
removed duplicates in imports
remove duplicates in code
Merge pull request #101 from sashakruglov/moztrap_5930

Issue #87. Moztrap #5930