updated test
solved some merge conflicts