Added base tests; still need logic tests