Changed array notations to the short one; Corrected some tests