Some tests removed and TODO's added.