Revamped unit tests to remove redundant testing, added some tests for the verification service.