Terminations are now added, unit tests work