Moved various tests to a TC file