Updated some things.
Tests.