Closes (#1)

javafx-template/src/main/java/app/Calc.java

@@ -38,10 +38,11 @@ public class Calc {
      * @throws IllegalArgumentException if n is larger than the operand count
      */
     public double peekOperand(int n) {
-        if (n > getOperandCount()) {
+        int index = getOperandCount() - n - 1;
+        if (index >= getOperandCount() || index < 0) {
             throw new IllegalArgumentException("Cannot peek at position " + n + " when the operand count is " + getOperandCount());
         }
-        return operandStack.get(getOperandCount() - n - 1);
+        return operandStack.get(index);
     }
 
     /**

javafx-template/src/test/java/app/CalcTest.java

@@ -87,9 +87,9 @@ public class CalcTest {
     public void testSwap() {
         Calc calc = new Calc(1.0, 3.14);
         calc.swap();
-        checkCalc(calc, 3.14, 1.0);
-        calc.swap();
         checkCalc(calc, 1.0, 3.14);
+        calc.swap();
+        checkCalc(calc, 3.14, 1.0);
     }
 
     @Test