Organize method tests a little more
Organize methods
Start to emulate `rational` style
Add all methods and (almost) finish tests