calc post-fix instead of converting to pre-fix, clean up, add baby tests