Initial checkin
Integrated new tests
Merge branch 'devel'