Using other branch with better test :'(