change unit tests and filtertypes