clean up and new tests