finish calculator.php and calculatorTests.php