finish layouts and routes
finish modyfying tests