hacking a bit more on asmver and passing os x tests