Added some tests and methods.