Rewrote tests to have less hard coded data