reWrote tests to be more concise.