Also adds a new test for the duration and removes the duration from the other tests to save on execution time.