Adding tests + adding some convenient things