refactor test files, put chore and claim user stories at top