wrote additional test
merge and fixed indents
merge