DAN-33 updated test

updated test
DAN-33 cleanup

cleanup