More testing and cleanup