fix for computed columns; switched unit tests to entities