enabled tests
possible pmerge fix