Add unit testing and resolution phase