Fix CS and reflect PHP5 behavior in test cases