New unit tests and new bugs fixed.