Bug fixes + turn off broken tests (will turn on when reimplementing scope)