Forgot 'else' case
Adding tests