adjust tests and handle string hooks better