All method based, further reduction needed, tests updated