Finished layout and routes, and added additional tests