Updated tests to take advantage of fixtures