General testing and improvement