More tests and fmt