Completed TSD Updates and Unit Tests