Fixed init array and some tests