Added base tests WIP