Fix some problems while running test_workspace_merge_service_post and test_workspace_merge_service_post_from_workspace tests on postgres
New GridLayout
Improve oauth2provider error control tests