restore tests
cleanup potential FWActions