Fix tests / convert remove project