Fixed some TC's.. Changed and added some suites