Substring on constructor instead, test update