Changed tests to be quicker