Add some tests + forall