Fix FilterElement and push initial tests