Updated tests to be more efficient