Clean up tests. Mainly getting rid of pending templates that just don't seem to make any sense here