Activated tests and rewrote some.