Fix fails in Pop User integration test
Fix some indentation, fix remaining failing tests