Fixed getAverageCombinedTime()

The old one didn’t handle null pointers.
Added all method implementations
Added tests for all methods