fixed many bugs - noboth ways positive test