alter test and implement to meet requirements