Added A+ tests.
Fixed A+ bug.