smaller test files
refactor tests