Tests and niceness.
Merged