More testing, more coverage...