Clean up warnings and rm tests w/32-64 variance