Added and moved Global constans

used them in the test files as well