Revert "Remove unused methods"

This reverts commit 156e50ea58bbf5c6e51c1b4de3205dfa47d1157e.
Clean up unused test