Filled out basic tests