Now have test passing at 5.3.3
refactored tests
further refactor of passing tests
Finishing layout and routes