Change Unit Tests structure and make them all pass.