Improved code style by replacing a bunch of snake_case with camelCase.
Fixed test by increasing wait time