Added test-cases for negative numbers. Magic strings are replaced by constants/