Feature/issue 21 elapsed time duplicated

Added test for elapsed time.