Move Unit Tests
Fix t function