Modified test cases. Removed all constants used for local variable assignment.