Fix most of the tests, need to fix the unpublish