handle null username/passwords and removed some test-scripts