Added tests that repeat themselves.
A collection of fixes.