some cleanups and new test