Fixing test
Structuring calculation functions into a Calculator model