added Phase02 model tests and fixed bugs