Fixed tests, changed snake_case to camelCase