use fixed testing plugin & modified some tests..