Statics, cleanup, tests