Some more tests and methods.

Not sure if it can't be improved.