Changed tests to accomodate for timer. Tests now take 160 seconds to complete (unfortunately)...