Adding tests and finishing Delta