Add tests & methods.

Add tests & methods.