Fixed tests and standards