Got version filtering working
Added more tests