Extend test for story 38