Fix failing test
Add old stuff
Add failing test