fixed some pending tests
fixed merge conflict