Added ordering, unit and end to end tests