Further improved testing and improoved user-experience