- Add Calculator class with add and multiply methods - Maintain original functions for compatibility - Update test code to use class interface