In the Shadow of the Hadamard Test: Using the Garbage State for Good and Further Modifications