Working on tests for new code