fixed to pending tests
merge