More tests and adding functionality.