Working on tests
Working on tests