Cleanup unused vars form tests