Push more cleanups and tests