add and fixed some tests
Merge remote-tracking branch 'origin/testing'