improve test to handle testing issues 14 and 15