fixing tests and converting strings into consts