added tests for elapsed time; reorganization