Fix specs for jenkins and applied various style changes for TD