Added main
Added expectation printing
Merge