more renaming, refactor tests
add alias and aggregate columns