Tests added for the various cases