More testing and completion