Repaired old tests and created new ones.