Working on tests for system
Working in progress