Name some constants and add more tests