updated test and added made suggested changes