Rewrote tests to be more vague