cleanups + ran the new tests