Add more testing for dead stuff