cleaning of some outdated unit-tests and files