Add closers and tests