FilterTest and bugfixes