Fix prefix and suffix and add tests