Add tests for all added order and orderby cases