Removed magic numbers
Fixed tests