Remove 2 suffix from gpui_macros, fix compile errors in tests

Co-authored-by: Mikayla <mikayla@zed.dev>