reverted code style to use underscores and fixed broken tests