Cleaning up activity tests