Modifies Unit Testing #77