fix strings and add more tests