completed some tests.. frontend changes
merge conflicts