Made [] to array, added a bunch of tests