Tests, fixing bugs.