Add: wrote a few tests