Refined beautiful column names and added tests.