renamed member
commented out dec tests
ConsAlias<Calculus> in constructors