Updated tests to speed up testing