Added more tests and started harvester stop function