Improved Tests.
Added some utility methods.