Added message to ArgumentError + tests