Fixed ex2-ex4 tests