Removed unneeded test and updated tests for TT.
Removed old DTL based layout code. Tidied code.