Make at_least and at_most expect messages instead of classes.

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
Remove some better messages todos

Signed-off-by: Sam Phippen <samphippen@googlemail.com>