fixed up tests, rendering js script adding, fixed up routing tree...