Add more specs and fix should syntax warning.