fixed tests
cleaned up masquerade host access
Merge branch 'devel'