Added OT tests and fixed some minor issues