updated test w/ merging branch