More fixing sign errors

Also fixing test case