JRH: Adding unit test and fixing column name