New test changes to cleanup

### asdasd
- [x] task 1
- [ ] tastk 2