Use doT throughout
Update test
Remove .DS_Store