separator annotation
refactored tests