do not append variable name to calculation names #268

Fixed tests.