Changes according Brian review
More finished and onfinish tests