Fixed columnKeys test
Bug fixes