fixed AP=2 mode
updated tests