adding new constants and fixing tests