Replaced call to send
Added expect block
Turned module validators into classes