Add unit tests
Fix column implementation