Remove obsolete tests
remove obsolete code
Merge branch 'develop' into ip-filter