Expand test coverage and compromise app structure.