Initial checkin
Integrated new tests