Rename to what it does and fix test
Remove warnings and fix current tests