Update Tests and Tools