Updated more tests, this will be 1.3 pre release still need to cleanup few things.