Fix core tests
Fix backlog tests