Fix bugs.
Rename methods.
Add test.
Test