adding missing tests + removing unneeded code