Add tests for re fetching and calculating columns and column names
Add tests for recalculation