deleted redundant test
refactoring
some more tweaking