Add GimmickHandler tests + code