Fixing tests; fixed unresolved committed merge conflicts