Alignment added.
Cool test added
Merge