More tests and disabled (not permanently) editing references