Started adding tests.