Cleanups, test additions