Sp compat test

this includes updates from master and two new commits so we can merge the failing tests