removed constants and moved to test