Increasing test coverage - specifically on resources, although partially on navigation. Some refactoring to associated files, and addition of data roles to nav elements.