Added unit tests over the Which-related failures