Added more cases when s_init is used to be tested.
Made printf always write 4 digits for formatting.
Removed unnecessary use of macros in the first loop.