Fixed unit-tests and get rid of a name clash