A bit better tests and comments. Nothing important.