Titlecase consts
Drop useless test
Fixed merge conflicts