remove some warnings
comment out tests that ought to be moved elsewhere
hand merge