Add transformer again
Add more tests
Update deps