Tests moved to specific folders
Refactor specification tests