Finish layout and routes, add users tests