Passing tests, update tags to work with arrays