Working on tests...
Write tests