added test area filter, minor bugfixes