Tests should be done for TSDB class.

Can you restore this to the expanded version?