[WIP] Upgrade test coverage