spec harness failing tests now passing
fixed merge conflicts