Modified the format of all tests