Fixed test-names, use waitFor instead of setTimeout