removed unit
removed unop
added more tests