adding some more test and fixing array of locations to return the right way