Add files for Filter unit tests
Merge: Get new project structure from master