CROWDCON-4 Finished Unit Tests