Add specs for issue 590