Tests, grunt, fix bug found.