More testing and clean up utils