changes in mappertest for testing
solved merge conflicts
fixed filter functions