Remove an unused method
Add more helper tests