Adapted tests to follow the standard.