Uncommented tests
fixed merge conflicts