mark - changed calculation names
mark - fixed keys for calculations; tests working