Added typedef Timer::time_type for time measurement.
Restructured test headers to prevent compiler warnings.
Merge remote-tracking branch 'bitbucket/master'