This change also significantly reduces duplicate information in test case. Signed-off-by: Ophestra <cat@gensokyo.uk>