filter tests
refactor and added some basic modules