added filter and service tests