added more tests and more constants