Added test to cover #25