Added testing of input values