Added some tests, utility method.