cleanups, tests updates