deleted unused stuff
added tests