moving specs
moved tests part 2
deleted unnecesary specs
another powerful refactor
Merge branch 'reagrouping-specs'