Add more spec testing.