Simple tests + improvement