More testing, more fixing