Why oh why, simpletest I still think its a dirty word
Added unpublish
Merge