added more unit tests, transition from phase 1 to phase 2