up to 5.2
cleanup tests and add routes
finish layout an routes